Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revision signature in About #1319

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Revision signature in About #1319

wants to merge 2 commits into from

Conversation

bbhtt
Copy link
Contributor

@bbhtt bbhtt commented Oct 24, 2023

Not very familiar with autoconf/automake but the idea should work. I've tried to keep it very simple.

Note.

  • The version string now needs to be only updated in .version. The tarball will be named liferea-v$version if from a tag or liferea-$sha-$date if from commit.
  • I don't know it is preferred to keep the "v" in version or not.
  • I haven't checked inside a tarball but it should just work.
  • This needs backported to 1.14 branch if merged with a different .version file.

Fixes #1258

Images

From the current HEAD git commit that does not belong to a tag:

5986e03ddb

From a checked out tag https://github.com/bbhtt/liferea/releases/tag/v1.110.819:

cfd58e2868

@bbhtt
Copy link
Contributor Author

bbhtt commented Oct 24, 2023

The issue is intlool-update doesn't support m4_esyscmd_s but does m4_esyscmd. I wanted to use the latter to avoid newlines. I guess I'll add stripping instead.

bbhtt
bbhtt commented Oct 26, 2023
View reviewed changes
version.sh
@@ -0,0 +1,24 @@
#!/usr/bin/env sh

set -eu
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this makes sense, I think if git is not available in a build system it'll make the script fail. Maybe I should remove this altogether or reverse the conditional to check for the non git case first.

@lwindolf
Copy link
Owner

Sorry for taking so long to review.

I'm very unsure whether the solution would work well, as I cannot predict the build enviroment of package maintainers. They more or less rely on configure.ac to statically provide a version. And we cannot predict wether they'll build from a git checkout or using a fresh source directory (make dist).

@bbhtt
Copy link
Contributor Author

bbhtt commented Jan 14, 2024 •
edited
Loading

In case it is not from git, it reads the first line of the .version file using head.

Instead of the static version in configure.ac it will be now in .version. The version file will be included in tarballs when make dist is run.

Here is a tarball produced from source using make dist https://github.com/bbhtt/liferea/releases/download/v1.110.819/liferea-v1.15.4.tar.gz

I don't think that will be an issue?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Can we add oneline revision signature in About?
2 participants
@bbhtt @lwindolf